Various fixes and redesign