working sliding menu
fixing conflicts