ui alignment and few null fixes.