layout added
some fixes
fixes