added new layouts types

various style fixes