Layout changes

- Button margin fix
- List View updated