Moved table down, fixed security check