All functionality added, modal very ugly