Updated UI, server, WIP!