Finished UI, added security