Re-factored UI in sample project