bugfix and some visual implementation