Clean up solution, create notification UI