Little fixes in status template