Quick and dirty design fix

[brodokk]

Hi.

This is just a very simple fix for now, I will see for propose another design later tho but at least this is a good start i think.

[hack13]

Looks good!