changed the whole layout, added modal dialogues