diff --git a/FinalProject/pushbutton.cpp b/FinalProject/pushbutton.cpp
index 007836e..05d226e 100644
--- a/FinalProject/pushbutton.cpp
+++ b/FinalProject/pushbutton.cpp
@@ -23,9 +23,13 @@ void PushButton::initializeUI() {
     _stretchLayout->setContentsMargins(_contentMargin);
     _stretchLayout->setSpacing(0);
     _stretchLayout->setAlignment(Qt::AlignCenter);
-    _stretchLayout->addWidget(_childWidget);
     setLayout(_stretchLayout);
-    _childWidget->show();
+    if (_childWidget) {
+        // prevent adding a null widget
+        _stretchLayout->addWidget(_childWidget);
+        _childWidget->show();
+        _childWidgetOriginalGeometry = _childWidget->geometry();
+    }
     
     // Initialize background widget
     _backgroundWidget = new QWidget(this);
@@ -241,6 +245,7 @@ void PushButton::mousePressEvent(QMouseEvent* event) {
     indicatorShrinkLength->start(QAbstractAnimation::DeleteWhenStopped);
 
     _pressed = true;
+    
     emit onPressed();
 }
 
@@ -291,9 +296,12 @@ void PushButton::mouseReleaseEvent(QMouseEvent* event) {
     }
     indicatorGrowLength->start(QAbstractAnimation::DeleteWhenStopped);
 
-    _pressed = false;
+    if (_pressed) {
+        // prevent double trigger if mouse is first left and then released
+        emit onClick();
+    }
 
-    emit onClick();
+    _pressed = false;
 }
 
 void PushButton::resizeEvent(QResizeEvent* event) {
@@ -790,8 +798,11 @@ void PushButton::setChildWidget(QWidget* widget) {
     for (int i = 0; i < _stretchLayout->count(); i++) {
         _stretchLayout->removeItem(_stretchLayout->itemAt(i));
     }
-    _stretchLayout->addWidget(_childWidget);
-    _childWidget->show();
+    if (_childWidget != nullptr) {
+        _stretchLayout->addWidget(_childWidget);
+        _childWidget->show();
+        _childWidgetOriginalGeometry = _childWidget->geometry();
+    }
 }
 
 bool PushButton::isSelected() const {
diff --git a/FinalProject/pushbutton.h b/FinalProject/pushbutton.h
index bec2439..8ac2f6d 100644
--- a/FinalProject/pushbutton.h
+++ b/FinalProject/pushbutton.h
@@ -19,12 +19,14 @@ public:
     };
         
 public:
-    PushButton(QWidget* child, QWidget* parent = 0);
+    PushButton(QWidget* child, QWidget* parent);
     ~PushButton();
 
 private:
     // Button Layout
     QWidget* _childWidget;
+    QRect _childWidgetOriginalGeometry;
+    const float _childWidgetShrinkRatio = 0.9;
     QHBoxLayout* _stretchLayout;
     QMargins _contentMargin = QMargins(12, 12, 12, 12);