Add Timeline like UI + some stack changes