fixed UI Issues