fix color

use old colors
layout fixes
Merge pull request #65 from marunjar/dev

merge dev branch