design done. Need to fix couple of hiovers in js