Added more features and a better layout