style tweaks and combined add and edit template