Cleaned up some of controls, some button placement, and firing when dead

Signed-off-by: jawillia <jawawilliams@gmail.com>