layout, loading, bugs

layout, loading, bugs