Interface overhaul to simplify and add icons