added dropdown buttons
added indicators
fixing merge issues