Few bug fixes and design adjustments