all layout added, a few tweaks left