#186 Only one of the upload/cache buttons -#151 UI mockup updates