refactored, preparing to add dynamic height
Merge branch 'development' of https://github.com/kakadadroid/StaimeCard into development