Major update. Includes more UI