layout fix
layout improvements
some big fixes
added rhombus structure