Now more visible if criteria are added + back button