Added borders to tables; cleaned up spacing