Layout fixed
Intermediate commit