Bug fixes and changing layout on menu to the right