layout tweak and jar fix. ID-218