Fixed more layout bugs