Removed some color..
Update layout