Move classes at the right spot + Finish user pages