Started working on the new design, looks like crap

for now...