Refactoring ui system, stablize everything...