13th Commit - Moar menu improvements