Small fixes and design fix