fixed alignment and bugs