General Refactor

Added class to display extra information to the user.