fix css & complete logic per user