Code rearranged

+ Little design issue related to the gift button fixed