Improved modals and font-awesome