Added importing and improved look/feel