Revert "Corrected errors led by conflict"

This reverts commit 56e23909b48cd94c38255926245cb643210b2515.
Revert "Revert "Corrected errors led by conflict""

This reverts commit a706fb7465eb144689683113c22b3d3ad4d79e01.
Revert "Revert "Revert "Corrected errors led by conflict"""

This reverts commit a13f05d6b4b8a128ea76dfc9c7c55fade08226e1.
Revert "Revert "Revert "Revert "Corrected errors led by conflict""""

This reverts commit 5ac26dbc2ebf8dd133fb40064ef97aefaa93e7f3.
Revert "Revert "Revert "Revert "Revert "Corrected errors led by conflict"""""

This reverts commit 1c57a68bb2653d9b381961dedbc9a69efe05c44d.
Revert 8142c81..3e93bf6

This rolls back to commit 8142c81c6f1f5691639da19a368cf8d5deda807a.
Edited layout