fixed alignment and constraints