Minor styling improvements + searching edge case