Added guest category filter and cleaned ui