Changed layout structure, minor improvements after code inspection
Merge remote-tracking branch 'origin/master'