Edited the code, organized the lay out