Fixed layout issues #2