Added modal and improved layout