fix disigning issues
add migration and flash message files
fix conflicts
fix some designing issue and some errors
fix various errors and change designing issues