Layout added and usability features being worked on