Implemented a slicker UI