Redone the main layout and added quotes