Added bandle, filter and layout