Fixed the biggest layout problems