Package update
Code cleanup
Fix List layout
Update