Code cleaning + menu improvements