Work on Event List Page and fixing merge