fixing shitty design