Removed bugs and improved display