Fixed layout issues
fixed issue 5