more layout fixes, alignment should be working