More refactoring
UI Fix.. I don't know why it works.