Updated with new modern design

Still a work in progress