Cleaned up Code and Added Mock Menu Items