Added Colors
Adjusts to Layout