some fixes, implmeneted UI containers