Modify signup layout and main menu layout
Fixed conflicts