Added new features, better appereance.