#12 Fixes
#13 Design & bug fix