Add better design (still ugly but... yeah, better. I guess...