Design changes and added popup