Some layout changes, bugfix