updated styles
Merge branch 'development'
updated styles
added includes