Updated style, added back functionality