layout fixes. Now it's SMOOOOOOTH