Finished UI, needs testing and code clean up