Updated with working buttons