Finished all design changes / cleanup