fixed alignment and other ui changes