UI fixes :D
Implementation of new cache model