Layout tweaking and minor styling