Made some updates

Mostly worked on the GUI
Added Shield OC