Change slightly styling of components and layout template