Rearranged controllers and added some li styling