Added cancel button, refactored table and slider