Updated GUI, fixed Database Bug