commiting to side for fixing master
Layouting finished
main Layout fixed