design overhaul; fixed issue #12 (tab indexes)
fix conflicts