Made alot of changes in the layout.