Working on client-side components / improvements