Fixed layout bugs 2