Bug fixes and changed default style