Cleaning up old shortcode admin view + some of it components