0.4.0-SNAPSHOT + Big UI improvements