changed layout
changed colors