Revamped layout
Fixed Dying