Layout and config improvements and some bug fixes