Fixed the border to be changed, added shadow for drawable. Also fixed some memory issues.