added more layouts and classes