Fixed class aligments