Fix for issue #6

Move away from tables for layout