Merged Michelle's UI into main code