many visual changes and bug fixes