Layout update
removed unused methods