all basic functionality complete
re-arranged layout