restyling and bug fix