Partially fixes deck option errors

Slight GUI tweaks

Authors: ammesonb, dbtrue