fixes width issue and adjusted template