Re-factoring UI components