Updated with more UI elements