Cleaned up UI and added queries override
Quick tidy up