Further design improvements. This looks way way better and more
readable!!!