fixing styles and small bugs