Fixed up UI, added more cool features