Restructure startup and add menu