Cleared deprecated code, edited visual elements