Layout changes
Minor styling changes, additional mock data