adjusted styles and template some more