Removed some stuff and adjusting font