[BUGFIX] Some layout changes