Merge branch 'master' into working
Merge branch 'master' into working
update main logout and manual sync <3 haha
Updated Home Page Layout