style guide fixes beginning
Some design changes and small bugs fixed.