API standadization and some layouts ajusts