Changed layouts of lists, recalibered main menu with current options