Merged with Omair & added floating buttons from yusik