Added layout dimentions.
Standaridzed margins and text sizes.
Standarized colors
Fixed merge conflicts