Fixed style realted issues in UI