fixes delete and rearranges layout for better angular support