bug fix for & in titles, layout adjustments