improved layout, changed title