Fixed bugs, worked on sorting features, styling and structure