cleaning up several UI components