Cleanup of design.
Added border style.