Cabinet pages + fixes