upload + layout fix