Fixed layout positioning
Merge remote-tracking branch 'origin/SagieBranch'