Layouts are nearly finished; Need to work on modal dialog [MJ-131]