Fixed some layout problems