Fix class and layout