Cleaned up widget code, TODO: fix speed widgit