Refactor after creating a cancel button...
Changed Button Layout