Fixed small ui problems