Finished UI re-wrapping, after testing will polish code and merge into develop