Adjuest margin
Rename layout files
Use CardView instead of FrameLayout