some color added
Merge branch 'homeScreen' into development