implemented action component + some fixes