bugfixes after alpha testing, new layout