Cleaned up a little and added a menu