In addition to last commit - bugfix and small CSS edit