Finished layout, and implemented sort