[Client] Minor fixes related to customizable create screen buttons