Updated look a bit