Revert "Button change and My Room Page"

This reverts commit b7b1ac1654b487b91cd37a75c15a4fee1cc36069.