Feature/style tweaks