#12 feature complete, a small issue concering relayout of header
controls is still remaining