Layout

Added layout to design, made some corrections.