Feature/general styling