Better drawable component, imporve Layout