Layout Changes, Cleaning up code