added better ui comonents