Fixed minor issues

Fixed minor issues and over all design