Updated style and added some features