Feature/style updates