FINISHED UI + OPTIMIZATIONS