cleaned up and restructured code
updated menu styles