small fixes
new set/get system
changed add/remove system
small layout improvements
layout fix