Bug fixes and design related changes