diff --git a/libretroBuildSystem/libretro.c b/libretroBuildSystem/libretro.c
index 882e0c95..b371c8c7 100644
--- a/libretroBuildSystem/libretro.c
+++ b/libretroBuildSystem/libretro.c
@@ -242,7 +242,7 @@ void retro_set_environment(retro_environment_t cb){
    struct retro_input_descriptor input_desc[] = {
       { 0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X, "Touchscreen Mouse X" },
       { 0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y, "Touchscreen Mouse Y" },
-      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R2,                             "Touchscreen Mouse Click" },
+      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R,                             "Touchscreen Mouse Click" },
       { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP,                             "Dpad Up" },
       { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN,                           "Dpad Down" },
 #if defined(EMU_SUPPORT_PALM_OS5)
@@ -364,7 +364,7 @@ void retro_run(void){
       
       palmInput.touchscreenX = touchCursorX / (palmFramebufferWidth - 1);
       palmInput.touchscreenY = touchCursorY / (palmFramebufferHeight - 1);
-      palmInput.touchscreenTouched = input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R2);
+      palmInput.touchscreenTouched = input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R);
    }
    else{
       //use RetroArch internal pointer
diff --git a/roadmap.txt b/roadmap.txt
index df4c0410..c810a317 100644
--- a/roadmap.txt
+++ b/roadmap.txt
@@ -19,6 +19,7 @@ v1.0.0 to v1.1.0(Feb 25 2019 - Easter 2019)
 RetroArch GUI:
 *allow mouse cursor to be rendered with multiple CPUs(removed for now)
 *now launches content like cartridge based systems
+*make default button layout match default controller layout better
 //TODO: allow adding more content after boot
 //TODO: get EMU_MANAGE_HOST_CPU_PIPELINE working on other platforms then the main 4
 //TODO: when compiling with "make platform=windows_x86_64" the dll wont load(theres a really good chance its because "libgomp-1.dll"(the OpenMP handler library) is missing from the RetroArch folder)