finish styles and bug fixes