Code cleanup, change UI style
Submodule update