added support on different layout