some styling and bug fixxing