Better layout, updated BS