Improve cart module fixed