renames files; adds inheritance for menus
simplifies new line declarations
comments and style tweaks