Partial Bug Fix, the hover is still messed up a bit