trying to fix layout bugs