More work on re-design

Thanks to @Melros for feedback