Improves UI and DB logic