Fixed minor style issues. Fixed right border from layout