Feature/auto resize