cleaned up the ui and added markers