Tidying up ui
Adding resource caching