UI works better now