layout fixes, maybe some other stuff