changed color schema and layout