Ticket #43: Added styling fixes