added a few classes
added layout