Added border, CSS tweaks