Fixes in styling and stuff