Upgraded to SDK 21 and replaced framelayout with CardView impl