Revert "Revert "Button change and My Room Page""

This reverts commit 1ea9d1e33e8200b88d7efce81f8f966f5efaad33.
Revert "Revert "Button changes""

This reverts commit 432e132b5521f08d6b3d42de4681fd384b0e4dba.