New Design, minor bug fixes