improve the look a bit from what I can remember of @antlam's mockup