Made some interface changes for a better look and feel