Significant formatting updates. Modals working