Added Sample and cleaned up tabs