Fixed design related issues

Closes #529