merge working code into master branch

this bit of styling need to be fixed