Better layout for BS3 (still issues to be fixed)