Updated gitmodules, continued work on UI