Fixed complex components layout and remaining issues with interactions