modified the look, add/remove implemented