Fixed layout errors

layout bugs fixed