classes + layout added