Version 1.0.0-beta-2

Layout, GUI fixes