Refactor and renaming
bug fixes, refactoring and main menu now takes into account logged status