change position to right side
watch button and  leave project button, location exchange
Merge pull request #431 from insanehong/issue/state-layout

Issue/state layout